; Merge from origin/emacs-28
authorStefan Kangas <stefan@marxist.se>
Sat, 7 May 2022 04:30:32 +0000 (06:30 +0200)
committerStefan Kangas <stefan@marxist.se>
Sat, 7 May 2022 04:30:32 +0000 (06:30 +0200)
The following commit was skipped:

936009cfe5 Be more resilient towards errors during error handling


Trivial merge